merge trunk
authorK. Handa <handa@gnu.org>
Wed, 4 Sep 2013 11:56:57 +0000 (20:56 +0900)
committerK. Handa <handa@gnu.org>
Wed, 4 Sep 2013 11:56:57 +0000 (20:56 +0900)
commitbd936dbfb7c0ba8fa5c254fbef63c7506126b35f
tree97426bc3e8be757c9a78206bcc960393a1c8d0c9
parenta4ac4df2ba07fb80bf9e5775fea1527642c5b2e0
parent7dbe250b31422697d472c43ebdcafa779b87070b
merge trunk